From 3f1b140fbed8ef8702f0be9a9e7355b341842692 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Sun, 16 Mar 2008 12:18:25 +0000 Subject: [PATCH] getenv() can return NULL. 2008-03-16 Mukund Sivaraman * babl/babl-extension.c: getenv() can return NULL. * babl/babl-memory.c: Check for NULL in babl_strcat(). svn path=/trunk/; revision=293 --- ChangeLog | 6 ++++++ babl/babl-extension.c | 5 ++++- babl/babl-memory.c | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ca5bf9f..0c33ded 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-16 Mukund Sivaraman + + * babl/babl-extension.c: getenv() can return NULL. + + * babl/babl-memory.c: Check for NULL in babl_strcat(). + 2008-03-16 Mukund Sivaraman * babl/babl-image.c: Added missing va_end()s. diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 6a3bb57..ebadb5f 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -272,10 +272,13 @@ expand_path (char *path) while (*src) { + char *home; switch (*src) { case '~': - dst = babl_strcat (dst, getenv ("HOME")); + home = getenv ("HOME"); + if (NULL != home) + dst = babl_strcat (dst, home); break; default: diff --git a/babl/babl-memory.c b/babl/babl-memory.c index f0c80a5..a5b407e 100644 --- a/babl/babl-memory.c +++ b/babl/babl-memory.c @@ -298,6 +298,9 @@ babl_strcat (char *dest, int src_len; int dst_len; + if (NULL == src) + return dest; + src_len = strlen (src); if (!dest) { -- 2.30.2